Merge conflicts solutioned

[RRRRHHHH_Code] / ruralHouses client / src / configuration / .DS_Store

diff --git a/ruralHouses client/src/configuration/.DS_Store b/ruralHouses client/src/configuration/.DS_Store
new file mode 100644 (file)
index 0000000..02896dc
Binary files /dev/null and b/ruralHouses client/src/configuration/.DS_Store differ